From 0041d06c9531207693fb29c02c5dd0044945f7e8 Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Wed, 12 Oct 2005 12:56:52 +0100 Subject: [PATCH] Don't try and call DevController if we can't destroy a device ourselves, because we are already inside the ValueError exception handler, so we know that the give device identifier is not an integer, and DevController.destroyDevice only accepts integers. Fixes bug #315. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/blkif.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index 5f791428bb..a15edf0963 100644 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -96,6 +96,4 @@ class BlkifController(DevController): if self.readBackend(i, 'dev') == devid: DevController.destroyDevice(self, i) return - # Try this, but it's almost certainly going to throw VmError, - # since we can't find the device. - DevController.destroyDevice(self, int(devid)) + raise VmError("Device %s not connected" % devid) -- 2.30.2